shopt -s expand_aliases

source ~/.profile

echo "<p class=time-tips>开始合并代码 start: $(date +"%Y-%m-%d %H:%M:%S")</p>"

if [ "$1" = "noneed" ]; then
  pullib dev
else
  mblibdev $1 $2
fi

if [ "$?" -gt 0 ]; then
  echo 'MERGE FAIL~~~'
  exit 1
fi

echo "<p class=time-tips>成功合并代码 end: $(date +"%Y-%m-%d %H:%M:%S") </p>"
